Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 23:34:04 +0000 (15:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 23:34:04 +0000 (15:34 -0800)
commit2e3884b02c147fea1b08472f65cf8353422d4640
tree5f62fde5b4471f1fa01cb96b61b8fb72e5408652
parentd83b3622a2f3d9c5b9086c6ed9c05efb813a272a
parentc35b03f6890c2eb207d34c10dc67ee49a9a35c26
Merge from mainline.